cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Unbreak. Wrong version of this port was imported.

Browse Source
This commit is contained in:
ajacoutot 2011-11-26 10:55:17 +00:00
parent 9536fab45e
commit f4107226d0
8 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
security/botan/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
# $OpenBSD: Makefile,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
ONLY_FOR_ARCHS= ${GCC4_ARCHS}
@ -44,7 +44,8 @@ CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--with-bzip2 \
--with-gnump \
--with-openssl \
--with-zlib
--with-zlib \
--without-sphinx
.if ${MACHINE_ARCH} == "amd64"
CONFIGURE_ARGS+=--disable-asm

2
security/botan/patches/patch-src_build-data_botan-config_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_build-data_botan-config_in,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
$OpenBSD: patch-src_build-data_botan-config_in,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
--- src/build-data/botan-config.in.orig Sun Oct 9 20:19:40 2011
+++ src/build-data/botan-config.in Sun Oct 9 20:20:28 2011
@@ -46,13 +46,13 @@ while test $# -gt 0; do

29
security/botan/patches/patch-src_build-data_cc_gcc_txt
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
--- src/build-data/cc/gcc.txt.orig Sun Oct 9 17:37:35 2011
+++ src/build-data/cc/gcc.txt Sun Oct 9 17:38:51 2011
@@ -33,6 +33,9 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)
$OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
--- src/build-data/cc/gcc.txt.orig Mon Jul 11 13:32:23 2011
+++ src/build-data/cc/gcc.txt Wed Nov 23 00:15:03 2011
@@ -33,12 +33,20 @@ default -> "$(CXX) -shared -fPIC -Wl,-soname,$(SONAME)
# AIX doesn't seem to have soname support (weird...)
aix -> "$(CXX) -shared -fPIC"
@ -11,3 +11,24 @@ $OpenBSD: patch-src_build-data_cc_gcc_txt,v 1.1.1.1 2011/11/26 09:07:52 jasper E
darwin -> "$(CXX) -dynamiclib -fPIC -install_name $(LIBDIR)/$(SONAME)"
hpux -> "$(CXX) -shared -fPIC -Wl,+h,$(SONAME)"
solaris -> "$(CXX) -shared -fPIC -Wl,-h,$(SONAME)"
</so_link_flags>
<mach_opt>
+# Avoid using -march=i[345]86, instead tune for generic
+i386 -> "-mtune=generic -momit-leaf-frame-pointer"
+i486 -> "-mtune=generic -momit-leaf-frame-pointer"
+i586 -> "-mtune=generic -momit-leaf-frame-pointer"
+
ppc601 -> "-mpowerpc -mcpu=601"
cellppu -> "-mcpu=cell"
e500v2 -> "-mcpu=8548"
@@ -49,9 +57,6 @@ alpha-ev7 -> "-mcpu=ev67"
# The patch from Debian bug 594159 has this, don't know why though...
sh4 -> "-m4 -mieee"
-
-# This is mostly for Debian's benefit
-i486 -> "-mtune=generic -momit-leaf-frame-pointer"
# Until GCC gets -march support for these models
nehalem -> "-march=core2 -msse4.1 -msse4.2 -momit-leaf-frame-pointer"

2
security/botan/patches/patch-src_build-data_makefile_unix_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_build-data_makefile_unix_in,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
$OpenBSD: patch-src_build-data_makefile_unix_in,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
--- src/build-data/makefile/unix.in.orig Mon Jul 11 13:32:23 2011
+++ src/build-data/makefile/unix.in Sun Oct 9 19:18:48 2011
@@ -12,12 +12,13 @@ VERSION = %{version}

2
security/botan/patches/patch-src_build-data_makefile_unix_shr_in
View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_build-data_makefile_unix_shr_in,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
$OpenBSD: patch-src_build-data_makefile_unix_shr_in,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
--- src/build-data/makefile/unix_shr.in.orig Mon Jul 11 13:32:23 2011
+++ src/build-data/makefile/unix_shr.in Sun Oct 9 19:52:41 2011
@@ -14,12 +14,13 @@ VERSION = %{version}

2
security/botan/pkg/PFRAG.amd64
View File

@ -1,3 +1,3 @@
@comment $OpenBSD: PFRAG.amd64,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
@comment $OpenBSD: PFRAG.amd64,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
include/botan-1.10/botan/idea_sse2.h
include/botan-1.10/botan/sha1_sse2.h

2
security/botan/pkg/PFRAG.shared
View File

@ -1,2 +1,2 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
@comment $OpenBSD: PFRAG.shared,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
@lib lib/libbotan-1.10.so.${LIBbotan-1.10_VERSION}

2
security/botan/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2011/11/26 09:07:52 jasper Exp $
@comment $OpenBSD: PLIST,v 1.2 2011/11/26 10:55:17 ajacoutot Exp $
%%SHARED%%
%%amd64%%
bin/botan-config-1.10