diff options
| author | rumko <rumko@pkgsrc.org> | 2015-01-09 16:29:04 +0000 |
|---|---|---|
| committer | rumko <rumko@pkgsrc.org> | 2015-01-09 16:29:04 +0000 |
| commit | 48bec98c8cb482e5929b447f71ce37fd374795ad (patch) | |
| tree | 3dbe5a113e09cafdbcf447ec473d5f9946217884 /lang/openjdk7/patches | |
| parent | d8167e611b9766c9a43abdba5aa6e8815adbda7c (diff) | |
| download | pkgsrc-48bec98c8cb482e5929b447f71ce37fd374795ad.tar.gz | |
lang/openjdk7: make it work on FreeBSD 10.* x86_64
* -Wno-new-returns-null is not currently known to installed clang on fbsd, make it optional
* on fbsd, openjdk builds libjsoundalsa and libsctp, add them optionally to PLIST
* add necessary patches to make it build on fbsd
Reviewed by wiz
Diffstat (limited to 'lang/openjdk7/patches')
| -rw-r--r-- | lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk | 12 | ||||
| -rw-r--r-- | lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c | 17 |
2 files changed, 26 insertions, 3 deletions
diff --git a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk index 0af5912b323..5304f7623a0 100644 --- a/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk +++ b/lang/openjdk7/patches/patch-jdk_make_java_net_FILES__c.gmk @@ -1,12 +1,18 @@ -$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.1 2014/07/25 20:35:14 ryoon Exp $ +$NetBSD: patch-jdk_make_java_net_FILES__c.gmk,v 1.2 2015/01/09 16:29:04 rumko Exp $ ---- jdk/make/java/net/FILES_c.gmk.orig 2014-06-14 20:38:28.000000000 +0000 +Use bsd_close.c on all BSD platforms, but avoid duplication on fbsd + +--- jdk/make/java/net/FILES_c.gmk.orig 2014-11-02 07:18:20.000000000 +0000 +++ jdk/make/java/net/FILES_c.gmk -@@ -44,7 +44,7 @@ ifeq ($(PLATFORM), linux) +@@ -45,11 +45,7 @@ ifeq ($(PLATFORM), linux) FILES_c += linux_close.c endif -ifeq ($(PLATFORM), macosx) +- FILES_c += bsd_close.c +-endif +- +-ifeq ($(OS_VENDOR), FreeBSD) +ifeq ($(PLATFORM), bsd) FILES_c += bsd_close.c endif diff --git a/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c b/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c new file mode 100644 index 00000000000..d004ca9455f --- /dev/null +++ b/lang/openjdk7/patches/patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c @@ -0,0 +1,17 @@ +$NetBSD: patch-jdk_src_solaris_native_com_sun_media_sound_PLATFORM__API__BsdOS__ALSA__PCM.c,v 1.1 2015/01/09 16:29:04 rumko Exp $ + +On some platforms ESTRPIPE is not defined, make it equal to EPIPE. + +--- jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c.orig 2014-11-02 07:18:19.000000000 +0000 ++++ jdk/src/solaris/native/com/sun/media/sound/PLATFORM_API_BsdOS_ALSA_PCM.c +@@ -30,6 +30,10 @@ + #include "PLATFORM_API_BsdOS_ALSA_CommonUtils.h" + #include "DirectAudio.h" + ++#ifndef ESTRPIPE ++#define ESTRPIPE EPIPE ++#endif ++ + #if USE_DAUDIO == TRUE + + // GetPosition method 1: based on how many bytes are passed to the kernel driver |