Attachment 131659 Details for Bug 175792 – glog-0.3.3.patch

[patch] glog-0.3.3.patch

glog-0.3.3.patch (text/plain), 3.25 KB, created by Yoshisato Yanagisawa on 2013-02-03 03:30:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Yoshisato Yanagisawa

Created: 2013-02-03 03:30:00 UTC

Size: 3.25 KB

patch

obsolete

>diff -ruN --exclude=CVS /usr/ports/devel/glog/Makefile ./Makefile
>--- /usr/ports/devel/glog/Makefile	2013-01-11 07:43:08.000000000 +0900
>+++ ./Makefile	2013-02-03 11:50:00.561214461 +0900
>@@ -1,20 +1,14 @@
>-# New ports collection makefile for:	google-glog
>-# Date created:			        Oct 14, 2008
>-# Whom:				        Cheng-Lung Sung <clsung@FreeBSD.org>
>-#
> # $FreeBSD: ports/devel/glog/Makefile,v 1.12 2013/01/10 22:43:08 svnexp Exp $
>-#
> 
> PORTNAME=	glog
>-PORTVERSION=	0.3.1
>-PORTREVISION=	2
>+PORTVERSION=	0.3.3
> CATEGORIES=	devel
> MASTER_SITES=	GOOGLE_CODE
> 
> MAINTAINER=	clsung@FreeBSD.org
> COMMENT=	A library of C++ classes for flexible logging
> 
>-LIB_DEPENDS=	execinfo.1:${PORTSDIR}/devel/libexecinfo \
>+LIB_DEPENDS=	execinfo:${PORTSDIR}/devel/libexecinfo \
> 		gflags:${PORTSDIR}/devel/gflags
> 
> GNU_CONFIGURE=	yes
>@@ -28,17 +22,9 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.if ${ARCH} == "amd64" || ${ARCH} =="ia64" || ${ARCH} =="powerpc" || ${ARCH} =="sparc64"
>-EXTRA_PATCHES=	${FILESDIR}/extra-patch-src-utilities.cc
>-.endif
>-
>-.if ${ARCH} == "amd64"
>-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-src-utilities.h
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} -e 's|^docdir.*|docdir = ${DOCSDIR}|' ${WRKSRC}/Makefile.in
>-.if defined(NOPORTDOCS)
>+.if !${PORT_OPTIONS:MDOCS}
> 	@${REINPLACE_CMD} -E -e '/^install-data-am/,/^$$/ s,install-(dist_doc|dist_html|html)DATA,,g' \
> 	    ${WRKSRC}/Makefile.in
> .endif
>diff -ruN --exclude=CVS /usr/ports/devel/glog/distinfo ./distinfo
>--- /usr/ports/devel/glog/distinfo	2011-04-07 18:12:37.000000000 +0900
>+++ ./distinfo	2013-02-03 11:45:57.982145422 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (glog-0.3.1.tar.gz) = eebc617a22a3f68594e74aed3c48a024f36c867b42324a79521259d6393bae24
>-SIZE (glog-0.3.1.tar.gz) = 490361
>+SHA256 (glog-0.3.3.tar.gz) = fbf90c2285ba0561db7a40f8a4eefb9aa963e7d399bd450363e959929fe849d0
>+SIZE (glog-0.3.3.tar.gz) = 509676
>diff -ruN --exclude=CVS /usr/ports/devel/glog/files/extra-patch-src-utilities.cc ./files/extra-patch-src-utilities.cc
>--- /usr/ports/devel/glog/files/extra-patch-src-utilities.cc	2011-04-07 18:12:37.000000000 +0900
>+++ ./files/extra-patch-src-utilities.cc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/utilities.cc.orig	2010-06-15 14:28:09.000000000 +0800
>-+++ src/utilities.cc	2011-04-07 17:00:18.000000000 +0800
>-@@ -227,8 +227,6 @@
>- #ifndef __NR_gettid
>- #ifdef OS_MACOSX
>- #define __NR_gettid SYS_gettid
>--#elif ! defined __i386__
>--#error "Must define __NR_gettid for non-x86 platforms"
>- #else
>- #define __NR_gettid 224
>- #endif
>diff -ruN --exclude=CVS /usr/ports/devel/glog/files/extra-patch-src-utilities.h ./files/extra-patch-src-utilities.h
>--- /usr/ports/devel/glog/files/extra-patch-src-utilities.h	2009-02-05 16:15:39.000000000 +0900
>+++ ./files/extra-patch-src-utilities.h	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- src/utilities.h.orig	2009-01-22 06:17:01.000000000 +0800
>-+++ src/utilities.h	2009-02-05 08:07:44.000000000 +0800
>-@@ -72,7 +72,7 @@
>- #if defined(HAVE_LIB_UNWIND)
>- # define STACKTRACE_H "stacktrace_libunwind-inl.h"
>- #elif !defined(NO_FRAME_POINTER)
>--# if defined(__i386__) && __GNUC__ >= 2
>-+# if (defined(__i386__) || defined(__amd64__)) && __GNUC__ >= 2
>- #  define STACKTRACE_H "stacktrace_x86-inl.h"
>- # elif defined(__x86_64__) && __GNUC__ >= 2
>- #  define STACKTRACE_H "stacktrace_x86_64-inl.h"

Actions: View | Diff

Attachments on bug 175792: 131659