cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Restore bsd specific iconv make flags lost in upstream merge conflict.

Browse Source 
Fixes missing libiconv_open symbol in libspashscreen.so.
This commit is contained in:
kurt 2019-02-08 20:36:44 +00:00
parent 4e6789282a
commit 78ae1b3660
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/jdk/1.8/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.39 2019/01/24 17:20:14 kurt Exp $
# $OpenBSD: Makefile,v 1.40 2019/02/08 20:36:44 kurt Exp $
ONLY_FOR_ARCHS= i386 amd64
USE_WXNEEDED= Yes
@ -13,6 +13,7 @@ PKGNAME= jdk-${V}
PKGNAME-main= jdk-${V}
PKGNAME-jre= jre-${V}
EPOCH= 0
REVISION= 0
DIST_SUBDIR= jdk
DISTNAME= openjdk-8u192b26-bsd-port-20190122

4
devel/jdk/1.8/patches/patch-hotspot_src_share_vm_runtime_globals_hpp
View File

@ -1,9 +1,9 @@
$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.3 2018/04/07 11:05:13 sthen Exp $
$OpenBSD: patch-hotspot_src_share_vm_runtime_globals_hpp,v 1.4 2019/02/08 20:36:44 kurt Exp $
Index: hotspot/src/share/vm/runtime/globals.hpp
--- hotspot/src/share/vm/runtime/globals.hpp.orig
+++ hotspot/src/share/vm/runtime/globals.hpp
@@ -3211,7 +3211,7 @@ class CommandLineFlags {
@@ -3238,7 +3238,7 @@ class CommandLineFlags {
product(uintx, MaxMetaspaceSize, max_uintx, \
"Maximum size of Metaspaces (in bytes)") \
\

26
devel/jdk/1.8/patches/patch-jdk_make_lib_Awt2dLibraries_gmk Normal file
View File

@ -0,0 +1,26 @@
$OpenBSD: patch-jdk_make_lib_Awt2dLibraries_gmk,v 1.1 2019/02/08 20:36:44 kurt Exp $
Index: jdk/make/lib/Awt2dLibraries.gmk
--- jdk/make/lib/Awt2dLibraries.gmk.orig
+++ jdk/make/lib/Awt2dLibraries.gmk
@@ -1236,6 +1236,11 @@ ifndef BUILD_HEADLESS_ONLY
LIBSPLASHSCREEN_splashscreen_png.c_CFLAGS := -x objective-c -O0
LIBSPLASHSCREEN_splashscreen_sys.m_CFLAGS := -O0
+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
+ LIBSPLASHSCREEN_CFLAGS += -DWITH_X11 $(X_CFLAGS) -I$(PACKAGE_PATH)/include
+ ifneq ($(OPENJDK_TARGET_OS_VENDOR), openbsd)
+ LIBSPLASHSCREEN_CFLAGS += -DLIBICONV_PLUG
+ endif
else ifeq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_CFLAGS += -DWITH_WIN32
else
@@ -1255,6 +1260,8 @@ ifndef BUILD_HEADLESS_ONLY
-framework Foundation \
-framework Cocoa \
-framework JavaNativeFoundation
+ else ifeq ($(OPENJDK_TARGET_OS), bsd)
+ LIBSPLASHSCREEN_LDFLAGS_SUFFIX += $(X_LIBS) -lX11 -lXext $(LIBM) -L$(PACKAGE_PATH)/lib -liconv -pthread
else ifeq ($(OPENJDK_TARGET_OS), windows)
LIBSPLASHSCREEN_LDFLAGS_SUFFIX += kernel32.lib user32.lib gdi32.lib delayimp.lib -DELAYLOAD:user32.dll
else # .. all other Unixes can use X_LIBS