* [gentoo-commits] gentoo-x86 commit in dev-libs/libtomcrypt/files: libtomcrypt-1.06-makefile.shared.diff libtomcrypt-1.06-makefile.diff
@ 2009-12-07 11:27 Thilo Bangert (bangert)
0 siblings, 0 replies; 2+ messages in thread
From: Thilo Bangert (bangert) @ 2009-12-07 11:27 UTC (permalink / raw
To: gentoo-commits
bangert 09/12/07 11:27:04
Added: libtomcrypt-1.06-makefile.shared.diff
libtomcrypt-1.06-makefile.diff
Log:
rework patches so they apply (bug #245998) - fix doc install location - disables tests
(Portage version: 2.2_rc56/cvs/Linux i686)
Revision Changes Path
1.1 dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff?rev=1.1&content-type=text/plain
Index: libtomcrypt-1.06-makefile.shared.diff
===================================================================
--- makefile.shared 2005-08-01 13:33:58.000000000 -0400
+++ makefile.shared 2005-08-07 19:41:08.000000000 -0400
@@ -6,7 +6,7 @@
# Tom St Denis
# The version
-VERSION=0:106
+VERSION=0:107
# Compiler and Linker Names
CC=libtool --mode=compile gcc
@@ -205,7 +205,7 @@
testprof/$(LIBTEST):
cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) make -f makefile.shared
-$(LIBNAME): $(OBJECTS)
+$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST)
libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]o" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME_S)
ranlib $(LIBNAME_S)
@@ -233,5 +233,5 @@
gcc -o $(TIMING) $(TIMINGS) -ltomcrypt_prof -ltomcrypt $(EXTRALIBS)
# $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff,v $
-# $Revision: 1.1 $
-# $Date: 2009/12/07 11:27:03 $
+# $Revision: 1.1 $
+# $Date: 2009/12/07 11:27:03 $
1.1 dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff?rev=1.1&content-type=text/plain
Index: libtomcrypt-1.06-makefile.diff
===================================================================
--- makefile 2005-08-01 13:33:58.000000000 -0400
+++ makefile 2005-08-07 19:41:08.000000000 -0400
@@ -4,7 +4,7 @@
# Modified by Clay Culver
# The version
-VERSION=1.06
+VERSION=1.07
# Compiler and Linker Names
#CC=gcc
@@ -254,16 +254,16 @@
install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
install -g $(GROUP) -o $(USER) doc/crypt.pdf $(DESTDIR)$(DATAPATH)
-install_test: $(LIBTEST)
+install_test: testprof/$(LIBTEST)
install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
- install -g $(GROUP) -o $(USER) $(LIBTEST) $(DESTDIR)$(LIBPATH)
+ install -g $(GROUP) -o $(USER) testprof/$(LIBTEST) $(DESTDIR)$(LIBPATH)
profile:
- CFLAGS="$(CFLAGS) -fprofile-generate" make timing EXTRALIBS=-lgcov
+ CFLAGS="$(CFLAGS) -fprofile-generate" make timing EXTRALIBS="$(EXTRALIBS) -lgcov"
./timing
rm -f timing `find . -type f | grep [.][ao] | xargs`
- CFLAGS="$(CFLAGS) -fprofile-use" make timing EXTRALIBS=-lgcov
+ CFLAGS="$(CFLAGS) -fprofile-use" make timing EXTRALIBS="$(EXTRALIBS) -lgcov"
#This rule cleans the source tree of all compiled code, not including the pdf
@@ -333,6 +333,6 @@
# $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff,v $
-# $Revision: 1.1 $
-# $Date: 2009/12/07 11:27:03 $
+# $Revision: 1.1 $
+# $Date: 2009/12/07 11:27:03 $
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in dev-libs/libtomcrypt/files: libtomcrypt-1.06-makefile.shared.diff libtomcrypt-1.06-makefile.diff
@ 2010-08-09 10:08 Thilo Bangert (bangert)
0 siblings, 0 replies; 2+ messages in thread
From: Thilo Bangert (bangert) @ 2010-08-09 10:08 UTC (permalink / raw
To: gentoo-commits
bangert 10/08/09 10:08:42
Modified: libtomcrypt-1.06-makefile.shared.diff
libtomcrypt-1.06-makefile.diff
Log:
fix patches that failed to apply (#331427)
(Portage version: 2.2_rc67/cvs/Linux i686)
Revision Changes Path
1.2 dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff?r1=1.1&r2=1.2
Index: libtomcrypt-1.06-makefile.shared.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtomcrypt-1.06-makefile.shared.diff 7 Dec 2009 11:27:03 -0000 1.1
+++ libtomcrypt-1.06-makefile.shared.diff 9 Aug 2010 10:08:42 -0000 1.2
@@ -18,11 +18,3 @@
libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]o" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME_S)
ranlib $(LIBNAME_S)
-@@ -233,5 +233,5 @@
- gcc -o $(TIMING) $(TIMINGS) -ltomcrypt_prof -ltomcrypt $(EXTRALIBS)
-
- # $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.shared.diff,v $
--# $Revision: 1.1 $
--# $Date: 2009/12/07 11:27:03 $
-+# $Revision: 1.1 $
-+# $Date: 2009/12/07 11:27:03 $
1.2 dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff?r1=1.1&r2=1.2
Index: libtomcrypt-1.06-makefile.diff
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libtomcrypt-1.06-makefile.diff 7 Dec 2009 11:27:03 -0000 1.1
+++ libtomcrypt-1.06-makefile.diff 9 Aug 2010 10:08:42 -0000 1.2
@@ -1,4 +1,4 @@
---- makefile 2005-08-01 13:33:58.000000000 -0400
+--- makefile.orig 2005-08-01 13:33:58.000000000 -0400
+++ makefile 2005-08-07 19:41:08.000000000 -0400
@@ -4,7 +4,7 @@
# Modified by Clay Culver
@@ -30,12 +30,3 @@
#This rule cleans the source tree of all compiled code, not including the pdf
-@@ -333,6 +333,6 @@
-
-
- # $Source: /var/cvsroot/gentoo-x86/dev-libs/libtomcrypt/files/libtomcrypt-1.06-makefile.diff,v $
--# $Revision: 1.1 $
--# $Date: 2009/12/07 11:27:03 $
-+# $Revision: 1.1 $
-+# $Date: 2009/12/07 11:27:03 $
-
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-08-09 10:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-12-07 11:27 [gentoo-commits] gentoo-x86 commit in dev-libs/libtomcrypt/files: libtomcrypt-1.06-makefile.shared.diff libtomcrypt-1.06-makefile.diff Thilo Bangert (bangert)
-- strict thread matches above, loose matches on Subject: below --
2010-08-09 10:08 Thilo Bangert (bangert)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox