aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwg <wg@FreeBSD.org>2013-06-19 00:25:47 +0800
committerwg <wg@FreeBSD.org>2013-06-19 00:25:47 +0800
commit0ff200e4f77a9ee3d2511afd54eebb93b0f3763f (patch)
treef366573acfb62b66324e4b4fd5ec2e629b8e33b1
parent0070eecd8b053ec475c288e6278d9a0e91ec6dcb (diff)
downloadfreebsd-ports-gnome-0ff200e4f77a9ee3d2511afd54eebb93b0f3763f.tar.gz
freebsd-ports-gnome-0ff200e4f77a9ee3d2511afd54eebb93b0f3763f.tar.zst
freebsd-ports-gnome-0ff200e4f77a9ee3d2511afd54eebb93b0f3763f.zip
devel/glog: remove patches
- Patches to fix the real issue have been integrated upstream http://code.google.com/p/google-glog/source/detail?r=116 PR: ports/175792 [1] Submitted by: Yoshisato YANAGISAWA <osho@pcc-software.org> Approved by: culot / jpaetzel (mentors, implicit), maintainer (timeout)
-rw-r--r--devel/glog/Makefile8
-rw-r--r--devel/glog/files/extra-patch-src-utilities.cc11
-rw-r--r--devel/glog/files/extra-patch-src-utilities.h11
3 files changed, 0 insertions, 30 deletions
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 8c5209893e3f..4fde7a5ad70e 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -22,14 +22,6 @@ LDFLAGS+= -L${LOCALBASE}/lib -lexecinfo
.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 ! ${PORT_OPTIONS:MDOCS}
diff --git a/devel/glog/files/extra-patch-src-utilities.cc b/devel/glog/files/extra-patch-src-utilities.cc
deleted file mode 100644
index 72967a340d54..000000000000
--- a/devel/glog/files/extra-patch-src-utilities.cc
+++ /dev/null
@@ -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 --git a/devel/glog/files/extra-patch-src-utilities.h b/devel/glog/files/extra-patch-src-utilities.h
deleted file mode 100644
index 0de83895d71e..000000000000
--- a/devel/glog/files/extra-patch-src-utilities.h
+++ /dev/null
@@ -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"