From 5e8668c3f1d780836e3f5eed65f69b21b3870d7c Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 27 May 2013 17:24:26 +0200
Subject: [PATCH] libtomcrypt: cross build support.

---
 .../patches/libtomcrypt_1.17-2.diff           | 52 +++++++++++--------
 srcpkgs/libtomcrypt/template                  | 30 +++++++----
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff b/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff
index a362e2eae8f..a8aaddfc7b3 100644
--- a/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff
+++ b/srcpkgs/libtomcrypt/patches/libtomcrypt_1.17-2.diff
@@ -21,27 +21,6 @@
  	rm -f *.txt
  
  #build the doxy files (requires Doxygen, tetex and patience)
---- libtomcrypt-1.17.orig/makefile.shared
-+++ libtomcrypt-1.17/makefile.shared
-@@ -248,15 +248,16 @@
- 
- objs: $(OBJECTS)
- 
--$(LIBNAME): $(OBJECTS) testprof/$(LIBTEST)
-+$(LIBNAME): $(OBJECTS)
- 	libtool --silent --mode=link gcc $(CFLAGS) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS) -o $(LIBNAME) -rpath $(LIBPATH) -version-info $(VERSION)
- 
- install: $(LIBNAME)
- 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
--	cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install
- 	libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la
- 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
- 	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
-+	install -d $(DESTDIR)$(LIBPATH)/pkgconfig
-+	install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc
- 
- #This rule makes the hash program included with libtomcrypt
- hashsum: library
 --- libtomcrypt-1.17.orig/libtomcrypt.3
 +++ libtomcrypt-1.17/libtomcrypt.3
 @@ -0,0 +1,96 @@
@@ -141,3 +120,34 @@
 +.PP
 +This manual page was written by Michael Stapelberg <michael@stapelberg.de>,
 +for the Debian project (and may be used by others).
+--- a/makefile.shared.orig	2007-05-12 16:46:25.000000000 +0200
++++ b/makefile.shared	2013-05-27 17:00:13.143450243 +0200
+@@ -9,7 +9,7 @@
+ VERSION=0:117
+ 
+ # Compiler and Linker Names
+-CC=libtool --mode=compile --tag=CC gcc 
++CC=libtool --mode=compile --tag=CC @@CC@@
+ 
+ # ranlib tools
+ ifndef RANLIB
+@@ -248,15 +248,16 @@ testprof/$(LIBTEST):
+ 
+ objs: $(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)
++$(LIBNAME): $(OBJECTS)
++	libtool --tag=CC --mode=link @@CC@@ $(CFLAGS) -rpath $(LIBPATH) -version-info $(VERSION) -o $(LIBNAME) `find . -type f | grep "[.]lo" | grep "src/" | xargs` $(EXTRALIBS)
+ 
+ install: $(LIBNAME)
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(LIBPATH)
+-	cd testprof ; CFLAGS="$(CFLAGS)" GROUP=$(GROUP) USER=$(USER) VERSION=$(VERSION) LIBPATH=$(LIBPATH) LIBTEST=$(LIBTEST) LIBTEST_S=$(LIBTEST_S) DESTDIR=$(DESTDIR) make -f makefile.shared install
+ 	libtool --silent --mode=install install -c libtomcrypt.la $(DESTDIR)$(LIBPATH)/libtomcrypt.la
+ 	install -d -g $(GROUP) -o $(USER) $(DESTDIR)$(INCPATH)
+ 	install -g $(GROUP) -o $(USER) $(HEADERS) $(DESTDIR)$(INCPATH)
++	install -d $(DESTDIR)$(LIBPATH)/pkgconfig
++	install -m 0644 -g $(GROUP) -o $(USER) libtomcrypt.pc $(DESTDIR)$(LIBPATH)/pkgconfig/libtomcrypt.pc
+ 
+ #This rule makes the hash program included with libtomcrypt
+ hashsum: library
diff --git a/srcpkgs/libtomcrypt/template b/srcpkgs/libtomcrypt/template
index 20f2ac54997..2519a9e0764 100644
--- a/srcpkgs/libtomcrypt/template
+++ b/srcpkgs/libtomcrypt/template
@@ -1,12 +1,9 @@
 # Template file for 'libtomcrypt'
 pkgname=libtomcrypt
 version=1.17
-revision=2
+revision=3
 patch_args="-Np1"
-build_style=gnu-makefile
 hostmakedepends="libtool"
-make_build_args="-f makefile.shared"
-make_install_args="-f makefile.shared NODOCS=1"
 short_desc="Fairly comprehensive, modular and portable cryptographic toolkit"
 maintainer="Juan RP <xtraeme@gmail.com>"
 license="Public domain"
@@ -19,14 +16,29 @@ long_desc="
  block ciphers, one-way hash functions, chaining modes, pseudo-random number
  generators, public key cryptography and a plethora of other routines."
 
+do_build() {
+	sed -e "s,@@CC@@,$CC,g;s,\$(CC),$CC,g" -i makefile.shared
+	if [ "$CROSS_BUILD" ]; then
+		cp /usr/bin/libtool .
+		sed -e "s,CCLD=.*,CCLD=$CC,g;s,CC=.*,CC=$CC,g" -i libtool
+		sed -e 's,libtool,./libtool,g' -i makefile.shared
+	fi
+	make RANLIB=$RANLIB -f makefile.shared ${makejobs}
+}
+
+do_install() {
+	make -f makefile.shared NODOCS=1 DESTDIR=${DESTDIR} install
+	vinstall ${sourcepkg}.3 644 usr/share/man/man3
+}
+
 libtomcrypt-devel_package() {
 	depends="${sourcepkg}-${version}_${revision}"
-	short_desc="${short_desc} -- development files"
+	short_desc+=" - development files"
 	pkg_install() {
-		vmove usr/include usr
-		vmove usr/lib/pkgconfig usr/lib
-		vmove "usr/lib/*.a" usr/lib
-		vinstall ${sourcepkg}.3 644 usr/share/man/man3
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.a"
+		vmove usr/share/man/man3
 	}
 }