OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 07-Aug-2009 14:07:34
Branch: HEAD Handle: 2009080713073300
Modified files:
openpkg-src/botan botan.patch botan.spec
Log:
workaround architecture detection for at least FreeBSD/amd64 and fix
substitution
Summary:
Revision Changes Path
1.15 +18 -6 openpkg-src/botan/botan.patch
1.33 +2 -2 openpkg-src/botan/botan.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/botan/botan.patch
============================================================================
$ cvs diff -u -r1.14 -r1.15 botan.patch
--- openpkg-src/botan/botan.patch 11 Jul 2009 20:37:11 -0000 1.14
+++ openpkg-src/botan/botan.patch 7 Aug 2009 12:07:33 -0000 1.15
@@ -1,6 +1,18 @@
+Index: configure.pl
+--- configure.pl.orig 2009-07-23 20:03:04 +0200
++++ configure.pl 2009-08-07 14:02:36 +0200
+@@ -2305,7 +2305,7 @@
+ }
+
+ my $uname = $$config{'uname'};
+- if($uname ne '') {
++ if($uname ne '' and $uname !~ m/FreeBSD/) {
+ my $cpu = guess_cpu_from_this($uname);
+
+ if($cpu ne '')
Index: src/build-data/cc/gcc
---- src/build-data/cc/gcc.orig 2009-07-11 17:41:26 +0200
-+++ src/build-data/cc/gcc 2009-07-11 22:29:13 +0200
+--- src/build-data/cc/gcc.orig 2009-07-23 20:03:05 +0200
++++ src/build-data/cc/gcc 2009-08-07 14:01:16 +0200
@@ -10,8 +10,8 @@
add_lib_dir_option "-L"
add_lib_option "-l"
@@ -13,8 +25,8 @@
lib_opt_flags "-O2 -finline-functions"
Index: src/build-data/makefile/unix.in
---- src/build-data/makefile/unix.in.orig 2009-07-11 17:41:26 +0200
-+++ src/build-data/makefile/unix.in 2009-07-11 22:31:35 +0200
+--- src/build-data/makefile/unix.in.orig 2009-07-23 20:03:05 +0200
++++ src/build-data/makefile/unix.in 2009-08-07 14:01:16 +0200
@@ -22,7 +22,7 @@
BINDIR = $(DESTDIR)/bin
LIBDIR = $(DESTDIR)/%{libdir}
@@ -25,8 +37,8 @@
CONFIG_SCRIPT = %{botan_config}
Index: src/utils/types.h
---- src/utils/types.h.orig 2009-07-11 17:41:27 +0200
-+++ src/utils/types.h 2009-07-11 22:29:13 +0200
+--- src/utils/types.h.orig 2009-07-23 20:03:06 +0200
++++ src/utils/types.h 2009-08-07 14:01:16 +0200
@@ -22,7 +22,7 @@
typedef unsigned __int64 u64bit;
#elif defined(__KCC)
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/botan/botan.spec
============================================================================
$ cvs diff -u -r1.32 -r1.33 botan.spec
--- openpkg-src/botan/botan.spec 24 Jul 2009 05:29:21 -0000 1.32
+++ openpkg-src/botan/botan.spec 7 Aug 2009 12:07:33 -0000 1.33
@@ -36,7 +36,7 @@
Group: Cryptography
License: BSD
Version: %{V_major}.%{V_minor}
-Release: 20090724
+Release: 20090807
# list of sources
Source0:
http://files.randombit.net/botan/v%{V_major}/Botan-%{version}.tgz
@@ -68,7 +68,7 @@
%build
perl -p -i.bak -e \
's;(0x[\da-fA-F]{16});\1ULL;g' \
- src/*.cpp
+ src/*/*.cpp
rm -f src/*.bak
%{l_shtool} subst \
-e 's;-mcpu=;-mtune=;g' \
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
