summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDane Smith <smithdanea@gmail.com>2010-07-25 11:14:40 -0400
committerDane Smith <smithdanea@gmail.com>2010-07-25 11:14:40 -0400
commit0c3f756a1b721809c8b0401337ef7bd0d4a0d794 (patch)
tree99f6b072928570cf3ae8d3789a2b775dbd805da0 /app-crypt
parentManifest. (diff)
parentPatch for makefile to allow job control & updated ebuild. (diff)
downloadsmithdanea-0c3f756a1b721809c8b0401337ef7bd0d4a0d794.tar.gz
smithdanea-0c3f756a1b721809c8b0401337ef7bd0d4a0d794.tar.bz2
smithdanea-0c3f756a1b721809c8b0401337ef7bd0d4a0d794.zip
Merge branch 'master' of ssh://172.18.0.100/home/code/git/smitdane/overlay
Conflicts: app-crypt/dieharder/Manifest
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/dieharder/Manifest3
-rw-r--r--app-crypt/dieharder/dieharder-2.28.1.ebuild1
-rw-r--r--app-crypt/dieharder/files/dieharder-2.28.1-makefile.diff30
3 files changed, 33 insertions, 1 deletions
diff --git a/app-crypt/dieharder/Manifest b/app-crypt/dieharder/Manifest
index 475e6cf..6151396 100644
--- a/app-crypt/dieharder/Manifest
+++ b/app-crypt/dieharder/Manifest
@@ -1,3 +1,4 @@
+AUX dieharder-2.28.1-makefile.diff 876 RMD160 31e6696a8eb0e13d0de2be42f0daa7070d9b9793 SHA1 6ef758eda33a82ccaad49f60a68dcb599ce6b7a2 SHA256 d8a046e0965b96bf87cc37029b4370d426f8fed381730f4ce5a26ed21353fc62
DIST dieharder-2.28.1.tgz 766985 RMD160 955d39077c093aec39da2688e4e51a249438d59e SHA1 789984e5ce582e3e59b8af0ae330d061435a10ed SHA256 748ec4716e64de38807e126f10335e45136fa789056e9f647a6bf73698205286
-EBUILD dieharder-2.28.1.ebuild 767 RMD160 d14548e31c24eb023c438bb86812959d4b0e124f SHA1 1bddd35e538e749d270a15de4f7260eb75439c96 SHA256 9a44102fcf242b6c9153aa6f867f5ded37e6d6ec5c8686d4403079a17ec9acb9
+EBUILD dieharder-2.28.1.ebuild 808 RMD160 6339d4507423e14e3b2eadd11d6da36f3675c4c2 SHA1 42c9c75c191172cc9817be03245fb1c22e3f9e7d SHA256 ca414092eaaaabfa9665320d963b46d1368c7059ba4dd90bafa4c81831393437
MISC ChangeLog 429 RMD160 52b43c5d213b5dffe64c9dca56d81e87d5ce5cd7 SHA1 f9538648fd0d9d7f97b283eae727f04282c15afc SHA256 e694b46ed5afe02bfce1c732884bc4370a525ac1af87bbe3bd53ffdf69097370
diff --git a/app-crypt/dieharder/dieharder-2.28.1.ebuild b/app-crypt/dieharder/dieharder-2.28.1.ebuild
index 668d315..e5e75e3 100644
--- a/app-crypt/dieharder/dieharder-2.28.1.ebuild
+++ b/app-crypt/dieharder/dieharder-2.28.1.ebuild
@@ -21,6 +21,7 @@ DEPEND="sci-libs/gsl"
RDEPEND="${DEPEND}"
src_prepare() {
+ epatch "${FILESDIR}"/${P}-makefile.diff
eautoreconf
}
diff --git a/app-crypt/dieharder/files/dieharder-2.28.1-makefile.diff b/app-crypt/dieharder/files/dieharder-2.28.1-makefile.diff
new file mode 100644
index 0000000..c201c96
--- /dev/null
+++ b/app-crypt/dieharder/files/dieharder-2.28.1-makefile.diff
@@ -0,0 +1,30 @@
+--- Makefile 2008-09-08 08:37:20.000000000 -0400
++++ Makefile.dieharder 2010-07-25 07:09:24.000000000 -0400
+@@ -734,23 +734,20 @@
+ # presume the simplest of dependencies and remake if includes change
+ # for example.
+ #========================================================================
+-all: $(LIBTIME) $(PROGTIME) $(INCTIME)
++all: $(LIBTIME) $(INCTIME) $(PROGTIME)
+
+ # This is not, actually, a particularly useful toplevel target. To
+ # work correctly it also would require a full parsing of all
+ # lower level dependencies. I'm leaving it in for the moment just
+ # to have a default target at the toplevel that CAN be used to test.
+ $(LIBTIME):
+- (cd $(LIBRARY); \
+- make)
++ +$(MAKE) -C $(LIBRARY)
+
+ $(INCTIME):
+- (cd include; \
+- make)
++ +$(MAKE) -C include
+
+ $(PROGTIME):
+- (cd $(PROGRAM); \
+- make)
++ +$(MAKE) -C $(PROGRAM)
+
+ $(ABS): Makefile
+ cat $(ABS) | \