Attachment #149583 for bug #195164

View | Details | Raw Unified | Return to bug 195164
Collapse All | Expand All




# $FreeBSD: head/databases/xtrabackup/Makefile 368423 2014-09-18 07:30:24Z tijl $

PORTNAME=	xtrabackup
PORTVERSION=	2.2.6
PORTREVISION=	1
CATEGORIES=	databases
MASTER_SITES=	http://www.percona.com/redir/downloads/XtraBackup/LATEST/source/tarball/
DISTNAME=	percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
DISTFILES=	percona-xtrabackup-${PORTVERSION}.tar.gz
EXTRACT_ONLY=	percona-xtrabackup-${PORTVERSION}.tar.gz

# quilt is required by build.sh
BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
		cmake:${PORTSDIR}/devel/cmake \
		quilt:${PORTSDIR}/devel/quilt \
		bison:${PORTSDIR}/devel/bison
LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt \
		libgpg-error.so:${PORTSDIR}/security/libgpg-error

		qpress:${PORTSDIR}/archivers/qpress

# autotool is in use for 5.1 builds
USES=		autoreconf:build gettext cmake iconv libtool perl5

PLIST_FILES=	bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt
		bin/innobackupex bin/xbcrypt

pre-build:
	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC}

do-build:
	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb55)
	${CP} ${WRKSRC}/src/xtrabackup_55 ${WRKSRC}
	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh innodb56)
	${CP} ${WRKSRC}/src/xtrabackup_56 ${WRKSRC}
	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb)
	${CP} ${WRKSRC}/src/xtrabackup ${WRKSRC}

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_55 ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_56 ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/src/xbstream ${STAGEDIR}${PREFIX}/bin
	${INSTALL_PROGRAM} ${WRKSRC}/src/xbcrypt ${STAGEDIR}${PREFIX}/bin
	${INSTALL_SCRIPT} ${WRKSRC}/innobackupex ${STAGEDIR}${PREFIX}/bin

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/distinfo (-2 / +2 lines)
1	SHA256 (percona-xtrabackup-2.1.7.tar.gz) = b0a89dd805fe25d1fd00c3f84b43d59e88173a19e2075d444a116118e2623587	1	SHA256 (percona-xtrabackup-2.2.6.tar.gz) = c5f42fbc406195e6de306b23a86f2d18283d3e086b9c1f4e8722635fd55e0b1d
2	SIZE (percona-xtrabackup-2.1.7.tar.gz) = 131538555	2	SIZE (percona-xtrabackup-2.2.6.tar.gz) = 34656899

Lines 1-10 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/files/patch-build.sh (-10 lines)
1	--- utils/build.sh 2013-08-01 15:26:37.000000000 +0200
2	+++ utils/build.sh 2013-08-13 08:52:57.520334456 +0200
3	@@ -289,6 +289,7 @@
4	-DWITH_EXTRA_CHARSETS=all \
5	-DWITH_EMBEDDED_SERVER=1 \
6	-DENABLE_DTRACE=OFF $extra_config_55plus"
7	+ export LIBS=-lcrypt
8	build_all $type
9	;;
10

Line 0 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/files/patch-cmake-install_layout.cmake (+11 lines)
	1	--- cmake/install_layout.cmake.orig 2014-11-19 12:37:46.000000000 +0100
	2	+++ cmake/install_layout.cmake 2014-11-19 12:38:08.000000000 +0100
	3	@@ -114,7 +114,7 @@
	4	#
	5	SET(INSTALL_SHAREDIR_STANDALONE "share")
	6	SET(INSTALL_MYSQLSHAREDIR_STANDALONE "share")
	7	-SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")
	8	+# SET(INSTALL_MYSQLTESTDIR_STANDALONE "xtrabackup-test")
	9	SET(INSTALL_SQLBENCHDIR_STANDALONE ".")
	10	SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files")
	11	#




--- include/my_global.h.orig	2014-11-19 12:34:01.000000000 +0100
+++ include/my_global.h	2014-11-19 12:34:39.000000000 +0100
@@ -333,9 +333,6 @@
 #ifdef HAVE_FCNTL_H
 #include <fcntl.h>
 #endif
-#ifdef HAVE_SYS_TIMEB_H
-#include <sys/timeb.h>				/* Avoid warnings on SCO */
-#endif
 #if TIME_WITH_SYS_TIME
 # include <sys/time.h>
 # include <time.h>




--- patches/innodb56.patch	2014-01-23 15:59:36.000000000 +0100
+++ patches/innodb56.patch	2014-02-18 10:50:05.000000000 +0100
@@ -2687,3 +2687,14 @@
  /*********************************************************************//**
  Wrapper around MySQL's copy_and_convert function.
  @return	number of bytes copied to 'to' */
+--- a/extra/yassl/taocrypt/include/misc.hpp
++++ b/extra/yassl/taocrypt/include/misc.hpp
+@@ -124,7 +124,7 @@
+ 
+ 
+ // no gas on these systems ?, disable for now
+-#if defined(__sun__) || defined (__APPLE__)
++#if defined(__sun__) || defined (__APPLE__) || defined(__clang__)
+     #define TAOCRYPT_DISABLE_X86ASM
+ #endif
+ 

Return to bug 195164

Lines 2-11 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/Makefile (-23 / +4 lines)
2	# $FreeBSD: head/databases/xtrabackup/Makefile 368423 2014-09-18 07:30:24Z tijl $	2	# $FreeBSD: head/databases/xtrabackup/Makefile 368423 2014-09-18 07:30:24Z tijl $
3		3
4	PORTNAME= xtrabackup	4	PORTNAME= xtrabackup
5	PORTVERSION= 2.1.7	5	PORTVERSION= 2.2.6
6	PORTREVISION= 1
7	CATEGORIES= databases	6	CATEGORIES= databases
8	MASTER_SITES= http://www.percona.com/downloads/XtraBackup/XtraBackup-${PORTVERSION}/source/	7	MASTER_SITES= http://www.percona.com/redir/downloads/XtraBackup/LATEST/source/tarball/
9	DISTNAME= percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}	8	DISTNAME= percona-${PORTNAME}-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
10	DISTFILES= percona-xtrabackup-${PORTVERSION}.tar.gz	9	DISTFILES= percona-xtrabackup-${PORTVERSION}.tar.gz
11	EXTRACT_ONLY= percona-xtrabackup-${PORTVERSION}.tar.gz	10	EXTRACT_ONLY= percona-xtrabackup-${PORTVERSION}.tar.gz
Lines 18-24 Link Here
18	# quilt is required by build.sh	17	# quilt is required by build.sh
19	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \	18	BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \
20	cmake:${PORTSDIR}/devel/cmake \	19	cmake:${PORTSDIR}/devel/cmake \
21	quilt:${PORTSDIR}/devel/quilt \
22	bison:${PORTSDIR}/devel/bison	20	bison:${PORTSDIR}/devel/bison
23	LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \	21	LIB_DEPENDS= libgcrypt.so:${PORTSDIR}/security/libgcrypt \
24	libgpg-error.so:${PORTSDIR}/security/libgpg-error	22	libgpg-error.so:${PORTSDIR}/security/libgpg-error
Lines 26-53 Link Here
26	qpress:${PORTSDIR}/archivers/qpress	24	qpress:${PORTSDIR}/archivers/qpress
27		25
28	# autotool is in use for 5.1 builds	26	# autotool is in use for 5.1 builds
29	USES= autoreconf:build gettext gmake iconv libtool perl5	27	USES= autoreconf:build gettext cmake iconv libtool perl5
30		28
31	PLIST_FILES= bin/xtrabackup bin/xtrabackup_55 bin/xtrabackup_56 bin/xbstream \	29	PLIST_FILES= bin/xtrabackup bin/xbstream bin/innobackupex bin/xbcrypt
32	bin/innobackupex bin/xbcrypt
33		30
34	pre-build:	31	pre-build:
35	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC}	32	${CP} ${DISTDIR}/percona-xtrabackup-${PORTVERSION}.tar.gz ${WRKSRC}
36		33
37	do-build:
38	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb55)
39	${CP} ${WRKSRC}/src/xtrabackup_55 ${WRKSRC}
40	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh innodb56)
41	${CP} ${WRKSRC}/src/xtrabackup_56 ${WRKSRC}
42	(cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./utils/build.sh xtradb)
43	${CP} ${WRKSRC}/src/xtrabackup ${WRKSRC}
44
45	do-install:
46	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup ${STAGEDIR}${PREFIX}/bin
47	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_55 ${STAGEDIR}${PREFIX}/bin
48	${INSTALL_PROGRAM} ${WRKSRC}/xtrabackup_56 ${STAGEDIR}${PREFIX}/bin
49	${INSTALL_PROGRAM} ${WRKSRC}/src/xbstream ${STAGEDIR}${PREFIX}/bin
50	${INSTALL_PROGRAM} ${WRKSRC}/src/xbcrypt ${STAGEDIR}${PREFIX}/bin
51	${INSTALL_SCRIPT} ${WRKSRC}/innobackupex ${STAGEDIR}${PREFIX}/bin
52
53	.include <bsd.port.mk>	34	.include <bsd.port.mk>

Line 0 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/files/patch-include-my_global.h (+12 lines)
	1	--- include/my_global.h.orig 2014-11-19 12:34:01.000000000 +0100
	2	+++ include/my_global.h 2014-11-19 12:34:39.000000000 +0100
	3	@@ -333,9 +333,6 @@
	4	#ifdef HAVE_FCNTL_H
	5	#include <fcntl.h>
	6	#endif
	7	-#ifdef HAVE_SYS_TIMEB_H
	8	-#include <sys/timeb.h> /* Avoid warnings on SCO */
	9	-#endif
	10	#if TIME_WITH_SYS_TIME
	11	# include <sys/time.h>
	12	# include <time.h>

Lines 1-17 Link Here

(-)/usr/home/pi/myp/databases/xtrabackup/files/patch-innodb56.patch (-17 lines)
1	--- patches/innodb56.patch 2014-01-23 15:59:36.000000000 +0100
2	+++ patches/innodb56.patch 2014-02-18 10:50:05.000000000 +0100
3	@@ -2687,3 +2687,14 @@
4	/*******************************************************************//
5	Wrapper around MySQL's copy_and_convert function.
6	@return number of bytes copied to 'to' */
7	+--- a/extra/yassl/taocrypt/include/misc.hpp
8	++++ b/extra/yassl/taocrypt/include/misc.hpp
9	+@@ -124,7 +124,7 @@
10	+
11	+
12	+ // no gas on these systems ?, disable for now
13	+-#if defined(__sun__) \|\| defined (__APPLE__)
14	++#if defined(__sun__) \|\| defined (__APPLE__) \|\| defined(__clang__)
15	+ #define TAOCRYPT_DISABLE_X86ASM
16	+ #endif
17	+