diff options
| author | tnn <tnn@pkgsrc.org> | 2015-02-07 22:35:24 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2015-02-07 22:35:24 +0000 |
| commit | b63ad0a02c270af0acfd6980085d1bea7c881997 (patch) | |
| tree | 5d66f89240d8df20f98fbd02ddd070030633aa07 /lang/openjdk7 | |
| parent | 1da956db0b386b7b5d1e8079596159bea7d61eb5 (diff) | |
| download | pkgsrc-b63ad0a02c270af0acfd6980085d1bea7c881997.tar.gz | |
No reason to keep netbsd-4 hacks when we don't have it in ONLY_FOR_PLATFORM
Diffstat (limited to 'lang/openjdk7')
| -rw-r--r-- | lang/openjdk7/Makefile | 6 | ||||
| -rw-r--r-- | lang/openjdk7/distinfo | 3 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-ai | 23 |
3 files changed, 2 insertions, 30 deletions
diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 74a621a7dd1..d1533f35ce1 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2015/02/03 16:50:30 tnn Exp $ +# $NetBSD: Makefile,v 1.85 2015/02/07 22:35:24 tnn Exp $ DISTNAME= openjdk-1.7.76-20150127 PKGNAME= openjdk7-1.7.76 @@ -252,10 +252,6 @@ do-install: ln -s ${LOWER_OPSYS}/jni_md.h \ ${DESTDIR}${JAVA_HOME}/include/jni_md.h -.if !empty(MACHINE_PLATFORM:MNetBSD-4.*-*) -MAKE_ENV+= PTHREAD_STACKSIZE=1024 -.endif - .if ${OPSYS} == "NetBSD" TOOLS_PLATFORM.unzip= .endif diff --git a/lang/openjdk7/distinfo b/lang/openjdk7/distinfo index 543ef646eca..f9c040ba90c 100644 --- a/lang/openjdk7/distinfo +++ b/lang/openjdk7/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.66 2015/02/03 16:50:30 tnn Exp $ +$NetBSD: distinfo,v 1.67 2015/02/07 22:35:24 tnn Exp $ SHA1 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 99bff3c702dd79076f4e705e3541f7e35bbb4306 RMD160 (openjdk7/apache-ant-1.9.4-bin.tar.bz2) = 7f4263d617bbf40a15eab401369d18a755f8d260 @@ -49,7 +49,6 @@ SHA1 (patch-ac) = 7a7853d8d0fd451e64a6fc39c28bd2bd8173adc6 SHA1 (patch-ae) = 843f05cfe8f18d080cae80eed92d9ad89a5c0917 SHA1 (patch-ag) = 83ec8015b8e0f2657f4289cea84bdc9b6d0c5e88 SHA1 (patch-ah) = 2d358879d2851fb2fb8161c5a1ac5a93aa7a69c2 -SHA1 (patch-ai) = bee1b592401d15a91e7d926c9011bcd0d83fb5ec SHA1 (patch-ak) = a8ce55038ee8755cf69a23bf77c4ea79466a8897 SHA1 (patch-al) = d174343a5baa8a73d18ff1020cb0cc19e6714175 SHA1 (patch-am) = d3ea039c882a73ff370b2c7bd6be94136b9f2bbb diff --git a/lang/openjdk7/patches/patch-ai b/lang/openjdk7/patches/patch-ai deleted file mode 100644 index 4bceaa7e433..00000000000 --- a/lang/openjdk7/patches/patch-ai +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ai,v 1.3 2013/06/15 09:31:05 jperkin Exp $ - -Support older NetBSD. - ---- hotspot/src/os/bsd/vm/attachListener_bsd.cpp.orig 2012-08-10 16:24:15.000000000 +0000 -+++ hotspot/src/os/bsd/vm/attachListener_bsd.cpp -@@ -345,11 +345,16 @@ BsdAttachOperation* BsdAttachListener::d - #ifdef _ALLBSD_SOURCE - uid_t puid; - gid_t pgid; -+#if defined(__NetBSD__) && __NetBSD_Version__ < 500000000 -+ /* no support for LOCAL_PEEREID here */ -+ return NULL; -+#else - if (::getpeereid(s, &puid, &pgid) != 0) { - int res; - RESTARTABLE(::close(s), res); - continue; - } -+#endif - #else - struct ucred cred_info; - socklen_t optlen = sizeof(cred_info); |