Attachment 886133 Details for Bug 1087493 – Use system libtomcrypt instead of bundled one

[patch] Use system libtomcrypt instead of bundled one

Use-system-libtomcrypt-instead-of-bundled-one.patch (text/plain), 2.78 KB, created by Ville Skyttä on 2014-04-14 13:00:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ville Skyttä

Created: 2014-04-14 13:00:02 UTC

Size: 2.78 KB

patch

obsolete

>From 50524a34b9f64afe921880de972e03a904cbae25 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta@iki.fi>
>Date: Mon, 14 Apr 2014 15:58:27 +0300
>Subject: [PATCH] Use system libtomcrypt instead of bundled one
>
>---
> olpc-contents-2.6-system-tomcrypt.patch | 29 +++++++++++++++++++++++++++++
> olpc-contents.spec                      | 10 ++++++++--
> 2 files changed, 37 insertions(+), 2 deletions(-)
> create mode 100644 olpc-contents-2.6-system-tomcrypt.patch
>
>diff --git a/olpc-contents-2.6-system-tomcrypt.patch b/olpc-contents-2.6-system-tomcrypt.patch
>new file mode 100644
>index 0000000..ed92af0
>--- /dev/null
>+++ b/olpc-contents-2.6-system-tomcrypt.patch
>@@ -0,0 +1,29 @@
>+diff --git a/Makefile b/Makefile
>+index bb603e1..783b176 100644
>+--- a/Makefile
>++++ b/Makefile
>+@@ -36,15 +36,15 @@ fastclone.so: cprl.o fastclone.o
>+ 	make -C $* clean
>+ 
>+ # .a dependency for the .o ensures that libtomcrypt is compiled/configured.
>+-fv.o: fv.c libtomcrypt_fast.a
>+-	$(CC) $(CFLAGS) -Wall -O2 -Ilibtomcrypt/src/headers -c $<
>+-fv: fv.o libtomcrypt_fast.a
>+-	$(CC) $(CFLAGS) -Wall -O2 -o $@ $^
>+-
>+-fc.o: fc.c libtomcrypt_fast.a
>+-	$(CC) $(CFLAGS) -Wall -O2 -Ilibtomcrypt/src/headers -c $<
>+-fc: fc.o libtomcrypt_fast.a
>+-	$(CC) $(CFLAGS) -Wall -O2 -o $@ $^
>++fv.o: fv.c
>++	$(CC) $(CFLAGS) -Wall -O2 $(shell pkg-config --cflags libtomcrypt) -c $<
>++fv: fv.o
>++	$(CC) $(CFLAGS) -Wall -O2 $(shell pkg-config --libs libtomcrypt) -o $@ $^
>++
>++fc.o: fc.c
>++	$(CC) $(CFLAGS) -Wall -O2 $(shell pkg-config --cflags libtomcrypt) -c $<
>++fc: fc.o
>++	$(CC) $(CFLAGS) -Wall -O2 $(shell pkg-config --libs libtomcrypt) -o $@ $^
>+ 
>+ dist: $(PKGVER).tar.bz2
>+ 
>diff --git a/olpc-contents.spec b/olpc-contents.spec
>index 1806a03..3d709e3 100644
>--- a/olpc-contents.spec
>+++ b/olpc-contents.spec
>@@ -1,15 +1,16 @@
> Name:		olpc-contents
> Version:	2.6
>-Release:	7%{?dist}
>+Release:	8%{?dist}
> Summary:	OLPC contents manifest tools
> 
> License:	GPLv2+ and Public Domain
> Group:		System Environment/Base
> URL:		http://dev.laptop.org/git/users/cscott/olpc-contents
> Source0:	http://dev.laptop.org/~dsd/olpc-contents/%{name}-%{version}.tar.bz2
>+Patch0:		%{name}-2.6-system-tomcrypt.patch
> BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
> 
>-BuildRequires:	python-devel, Pyrex, libicu-devel
>+BuildRequires:	python-devel, Pyrex, libicu-devel, libtomcrypt-devel
> Requires:		bitfrost
> 
> %description
>@@ -21,6 +22,8 @@ installed.
> 
> %prep
> %setup -q
>+%patch0 -p1
>+rm -r libtomcrypt
> 
> 
> %build
>@@ -50,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
> 
> 
> %changelog
>+* Mon Apr 14 2014 Ville SkyttÃ¤ <ville.skytta@iki.fi> - 2.6-8
>+- Use system libtomcrypt instead of bundled one
>+
> * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.6-7
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
> 
>-- 
>1.9.0

Actions: View | Diff

Attachments on bug 1087493: 886133