sys-fs/tux3progs: new version of makefile patch

git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@1227 6952d904-891a-0410-993b-d76249ca496b
2009-05-18 05:58:10 +00:00 · 2009-05-18 05:58:10 +00:00 · fcc4e90abe
parent bb0c2bdcad
commit fcc4e90abe
4 changed files with 99 additions and 3 deletions
--- a/sys-fs/tux3progs/ChangeLog
+++ b/sys-fs/tux3progs/ChangeLog
@ -2,6 +2,10 @@
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $

+  18 May 2009; Mario Fetka <mario.fetka@gmail.com>
+  +files/tux3-dist-packager-3.patch, tux3progs-9999.ebuild:
+  new version of makefile patch
+
  18 May 2009; Mario Fetka <mario.fetka@gmail.com>
  files/tux3-dist-packager-2.patch, tux3progs-9999.ebuild:
  update makefile add bin and tesbin target
--- a/sys-fs/tux3progs/Manifest
+++ b/sys-fs/tux3progs/Manifest
@ -1,6 +1,7 @@
 AUX tux3-dist-packager-1.patch 2136 RMD160 19cdf75b888b2b4f843538742b770d7293576eb2 SHA1 4d4ccbba9aa3fd994472cfa2973f6980714a3060 SHA256 f86d2b17d7769136f212dd2479c1d978967deb88caac848a7da861beccccb8e5
 AUX tux3-dist-packager-2.patch 2643 RMD160 02a7f5c6ebfa06c904e657cd5f548895825526f4 SHA1 efc06bbf4558f47ced7fc0a54df1aa7ac5b9a3a3 SHA256 fdefb843be5f16836143cf49f3e6a5bf6e4e39d1d09b917fad256b67a645846a
+AUX tux3-dist-packager-3.patch 2824 RMD160 9a867e5f0aa4f182978b4615ef359296a66244ee SHA1 d84d39ddaaf92cd763eb5843337bfdc15823baed SHA256 a0d3b007fd89e378d2a863cf91e066bd79158ca0a1471106f2fb43918cbde5e6
 AUX tux3-gcc44-1.patch 2569 RMD160 98b8df81f5a9809eefb04fad5d29aca000159d56 SHA1 a9d1d38af5bd1516426de2f3c6a902930851bcae SHA256 057783f2b3224f6307c4239d40654d9abe34986dd5527f282da9fdad61cd791c
-EBUILD tux3progs-9999.ebuild 944 RMD160 c321387a001ae85a8ad94a53b5930473a536e299 SHA1 5185fe09a9e8a6acd3b1a3ef733da82e39d61d29 SHA256 b35401890ea7c8cb5975f0d52373663fac3c927a16fd466f65ae583733328de6
-MISC ChangeLog 1035 RMD160 0cec1206088c6c776b9a5eabf94d9f8f93e11214 SHA1 ff07f6b899c7f731568fdd64579358ba0154aa8c SHA256 b5628baf1787bdd08cc123f871f0c513fdccc114cecf76d677a9944356e4751a
+EBUILD tux3progs-9999.ebuild 944 RMD160 108b293640c63e60ff88985f32ef98030e78084a SHA1 621e132a4d96ed9f94a91e6c9b88c7073c122251 SHA256 8c6b87187a3b8961de0cb9c77ee95b5e63d34c8518ecd147abfe307a772d3714
+MISC ChangeLog 1179 RMD160 51d40bbc2c211a7949730fcbab95110ca60809bf SHA1 2121f51be622d628a0a7dbe3516088bec95345ee SHA256 d12a9690ab0eaac44ca3678ab7a272814b0c0b8bf13dc7554d73a7ceed2899c9
 MISC metadata.xml 1238 RMD160 c82938e77f387291d6a1c3bf9b0d802f2878dd12 SHA1 b5738f14922c69e78cfb867acdc65eeea25977bf SHA256 2c13f98be5fa8bdaf21ac86bcd00bbeb8944df5615de0cfce35ae4c00ef4b4d5
--- a/sys-fs/tux3progs/files/tux3-dist-packager-3.patch
+++ b/sys-fs/tux3progs/files/tux3-dist-packager-3.patch
@ -0,0 +1,91 @@
+Submitted By: Mario Fetka (mario dot fetka at gmail dot com)
+Date: 2009-05-18
+Initial Package Version: changeset cb5655728089
+Origin: me
+Upstream Status: unknown
+Description: add new install targets and add LDFLAGS
+
+diff -Naur tux3.orig/user/Makefile tux3/user/Makefile
+--- tux3.orig/user/Makefile	2009-05-17 20:13:43.438558904 +0000
+++ tux3/user/Makefile	2009-05-18 05:53:47.299567472 +0000
+@@ -11,22 +11,32 @@
+ CFLAGS += -Wno-unused-parameter -Wno-sign-compare -Wno-missing-field-initializers
+ CFLAGS += $(UCFLAGS)
+ 
+LDFLAGS =
+
+ CHECKER = sparse
+ CHECKFLAGS = -D__CHECKER__ -D__CHECK_ENDIAN__ -Wbitwise -Wno-transparent-union
+ CHECKFLAGS += -Wno-decl -Wno-declaration-after-statement
+ 
+ VG=valgrind --error-exitcode=200 --leak-check=full
+INSTALL = install
+ 
+ TESTDIR = .
+OWNER = root
+GROUP = root
+ 
+-testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
+-tux3bin = tux3 tux3graph
+-binaries = $(testbin) $(tux3bin) tux3fuse
+DISTDIR =
+PREFIX=/usr/local
+SBINDIR = $(PREFIX)/sbin
+LIBEXECDIR = $(PREFIX)/libexec/tux3
+ 
+ ifeq ($(shell pkg-config fuse && echo found), found)
+-	binaries += tux3fuse
+	fusebin = tux3fuse
+ endif
+ 
+testbin = buffer balloc dleaf ileaf iattr xattr btree dir filemap inode commit
+tux3bin = tux3 tux3graph
+binaries = $(testbin) $(tux3bin) $(fusebin)
+
+ tuxdeps		= Makefile trace.h kernel/trace.h
+ diskiodeps	= diskio.c diskio.h
+ bufferdeps	= buffer.c buffer.h diskio.h err.h list.h
+@@ -53,6 +63,9 @@
+ tests: test_buffer test_balloc test_commit test_dleaf test_ileaf \
+ 	test_btree test_dir test_iattr test_xattr test_filemap test_inode
+ 
+bin: $(tux3bin) $(fusebin)
+testbin: $(testbin)
+
+ # standalone and library
+ buffer.o: $(tuxdeps) $(bufferdeps)
+ diskio.o: $(tuxdeps) $(diskiodeps)
+@@ -93,8 +106,8 @@
+ 	$(CHECKER) $(CFLAGS) -Dbuild_$(<:.c=) $(CHECKFLAGS) -c $<
+ endif
+ 
+-$(testbin) $(tux3bin):
+-	$(CC) $(CFLAGS) $^ -o $@
+$(testbin) tux3 tux3grath:
+	$(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
+ 
+ test_buffer: buffer
+ 	$(VG) ./buffer
+@@ -130,7 +143,7 @@
+ 	$(VG) ./commit foodev
+ 
+ tux3fuse: utility.o tux3fuse.o
+-	$(CC) $(CFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
+	$(CC) $(CFLAGS) $(LDFLAGS) $$(pkg-config --cflags fuse) utility.o tux3fuse.c -lfuse -otux3fuse
+ ifeq ($(CHECK),1)
+ 	$(CHECKER) $(CFLAGS) $(CHECKFLAGS) $$(pkg-config --cflags fuse) tux3fuse.c
+ endif
+@@ -160,3 +173,13 @@
+ 
+ distclean: clean
+ 	rm -f *.orig kernel/*.orig
+
+install: install-bin install-test
+
+install-bin:
+	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(SBINDIR)
+	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(tux3bin) $(fusebin) $(DISTDIR)$(SBINDIR)
+
+install-test: install-bin
+	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 -d $(DISTDIR)$(LIBEXECDIR)
+	$(INSTALL) -c -o $(OWNER) -g $(GROUP) -m 755 $(testbin) $(DISTDIR)$(LIBEXECDIR)
--- a/sys-fs/tux3progs/tux3progs-9999.ebuild
+++ b/sys-fs/tux3progs/tux3progs-9999.ebuild
@ -21,7 +21,7 @@ DEPEND=""
 S="${WORKDIR}/tux3/user"

 src_prepare() {
-	epatch "${FILESDIR}"/tux3-dist-packager-2.patch
+	epatch "${FILESDIR}"/tux3-dist-packager-3.patch
 	epatch "${FILESDIR}"/tux3-gcc44-1.patch
 }