Fix symbol conflict issues with eclipse by enabling the use of
version scripts. Also complete SYSTEM_ZLIB build hooks and enable it to use system libz.
This commit is contained in:
kurt
parent
646f5aaf1d
commit
f3783a0dd8
@ -1,4 +1,4 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2008/12/21 03:59:44 kurt Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2008/12/22 13:22:12 kurt Exp $
|
||||
|
||||
SHARED_ONLY= Yes
|
||||
ONLY_FOR_ARCHS= i386 amd64
|
||||
@ -10,8 +10,8 @@ B= b24
|
||||
DISTFILES= openjdk7-${B}.tar.bz2 \
|
||||
jdk-7-icedtea-plugs-1.6.tar.gz
|
||||
PKGNAME= jdk-${V}
|
||||
PKGNAME-main= jdk-${V}${B}p3
|
||||
PKGNAME-jre= jre-${V}${B}p3
|
||||
PKGNAME-main= jdk-${V}${B}p4
|
||||
PKGNAME-jre= jre-${V}${B}p4
|
||||
|
||||
CATEGORIES= devel/jdk java
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.3 2008/05/05 02:51:20 kurt Exp $
|
||||
--- hotspot/build/bsd/makefiles/gcc.make.orig Sun May 4 09:11:04 2008
|
||||
+++ hotspot/build/bsd/makefiles/gcc.make Sun May 4 09:13:28 2008
|
||||
$OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.4 2008/12/22 13:22:12 kurt Exp $
|
||||
--- hotspot/build/bsd/makefiles/gcc.make.orig Sat Dec 20 22:26:49 2008
|
||||
+++ hotspot/build/bsd/makefiles/gcc.make Sat Dec 20 23:52:53 2008
|
||||
@@ -25,9 +25,10 @@
|
||||
#------------------------------------------------------------------------
|
||||
# CC, CPP & AS
|
||||
@ -45,19 +45,7 @@ $OpenBSD: patch-hotspot_build_bsd_makefiles_gcc_make,v 1.3 2008/05/05 02:51:20 k
|
||||
# Except for a few acceptable ones
|
||||
ACCEPTABLE_WARNINGS = -Wpointer-arith -Wconversion -Wsign-compare
|
||||
CFLAGS_WARN/DEFAULT = $(WARNINGS_ARE_ERRORS) $(ACCEPTABLE_WARNINGS)
|
||||
@@ -129,6 +123,11 @@ endif
|
||||
# Enable linker optimization
|
||||
LFLAGS += -Xlinker -O1
|
||||
|
||||
+# XXXBSD: need this until j2se is ported and libfontmanager/libjavaplugin_nscp
|
||||
+# can be linked with needed libs (supc++ etc). For now it is getting some symbols
|
||||
+# from libjvm.
|
||||
+LDNOMAP = true
|
||||
+
|
||||
# Use $(MAPFLAG:FILENAME=real_file_name) to specify a map file.
|
||||
MAPFLAG = -Xlinker --version-script=FILENAME
|
||||
|
||||
@@ -136,7 +135,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
|
||||
@@ -136,7 +130,7 @@ MAPFLAG = -Xlinker --version-script=FILENAME
|
||||
SONAMEFLAG = -Xlinker -soname=SONAME
|
||||
|
||||
# Build shared library
|
||||
|
||||
@ -0,0 +1,12 @@
|
||||
$OpenBSD: patch-hotspot_build_bsd_makefiles_launcher_make,v 1.1 2008/12/22 13:22:12 kurt Exp $
|
||||
--- hotspot/build/bsd/makefiles/launcher.make.orig Sun Dec 21 08:48:16 2008
|
||||
+++ hotspot/build/bsd/makefiles/launcher.make Sun Dec 21 01:27:05 2008
|
||||
@@ -48,7 +48,7 @@ else
|
||||
LIBS_LAUNCHER += -l$(JVM) $(LIBS)
|
||||
endif
|
||||
|
||||
-LINK_LAUNCHER = $(LINK.c)
|
||||
+LINK_LAUNCHER = $(LINK.CC)
|
||||
|
||||
LINK_LAUNCHER/PRE_HOOK = $(LINK_LIB.CC/PRE_HOOK)
|
||||
LINK_LAUNCHER/POST_HOOK = $(LINK_LIB.CC/POST_HOOK)
|
||||
@ -1,6 +1,6 @@
|
||||
$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
--- jdk/make/common/Defs-bsd.gmk.orig Wed Nov 7 14:40:30 2007
|
||||
+++ jdk/make/common/Defs-bsd.gmk Wed Nov 7 14:50:22 2007
|
||||
$OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
|
||||
--- jdk/make/common/Defs-bsd.gmk.orig Sat Dec 20 22:26:51 2008
|
||||
+++ jdk/make/common/Defs-bsd.gmk Sat Dec 20 23:03:00 2008
|
||||
@@ -43,12 +43,6 @@
|
||||
# Get shared JDK settings
|
||||
include $(JDK_MAKE_SHARED_DIR)/Defs.gmk
|
||||
@ -101,3 +101,18 @@ $OpenBSD: patch-jdk_make_common_Defs-bsd_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp
|
||||
override OTHER_M4FLAGS = -D__GLIBC__ -DGNU_ASSEMBLER
|
||||
override SUN_CMM_SUBDIR =
|
||||
override THREADS_FLAG = native
|
||||
@@ -317,6 +279,14 @@ override USE_EXECNAME = true
|
||||
# HAVE_DPS should only be "no" if the platform has no DPS headers or libs
|
||||
# DPS (Displayable PostScript) is available on Solaris machines
|
||||
HAVE_DPS = no
|
||||
+
|
||||
+ifeq ($(OS_VENDOR), FreeBSD)
|
||||
+ SYSTEM_ZLIB = true
|
||||
+endif
|
||||
+
|
||||
+ifeq ($(OS_VENDOR), OpenBSD)
|
||||
+ SYSTEM_ZLIB = true
|
||||
+endif
|
||||
|
||||
#
|
||||
# Japanese manpages
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-jdk_make_common_Program_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
$OpenBSD: patch-jdk_make_common_Program_gmk,v 1.2 2008/12/22 13:22:12 kurt Exp $
|
||||
--- jdk/make/common/Program.gmk.orig Sat Dec 1 00:00:00 2007
|
||||
+++ jdk/make/common/Program.gmk Mon Mar 3 14:04:43 2008
|
||||
@@ -67,11 +67,19 @@ endif
|
||||
+++ jdk/make/common/Program.gmk Sun Dec 21 22:08:35 2008
|
||||
@@ -67,11 +67,22 @@ endif
|
||||
# Create a dependency on libjli (Java Launcher Infrastructure)
|
||||
#
|
||||
# On UNIX, this is a relative dependency using $ORIGIN. Unfortunately, to
|
||||
@ -18,11 +18,14 @@ $OpenBSD: patch-jdk_make_common_Program_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
+ LDFLAGS += -Wl,--no-whole-archive
|
||||
+# Work-around an dlsym(RTLD_DEFAULT) bug in at least FreeBSD & OpenBSD
|
||||
+ LDFLAGS += -Wl,--export-dynamic
|
||||
+ ifeq ($(SYSTEM_ZLIB),true)
|
||||
+ OTHER_LDLIBS += -lz
|
||||
+ endif
|
||||
+endif
|
||||
ifneq (,$(findstring $(PLATFORM), linux solaris)) # UNIX systems
|
||||
LDFLAGS += -L $(LIBDIR)/$(LIBARCH)/jli
|
||||
OTHER_LDLIBS += -ljli
|
||||
@@ -174,6 +182,10 @@ else # USE_PTHREADS
|
||||
@@ -174,6 +185,10 @@ else # USE_PTHREADS
|
||||
THREADLIBS = $(LIBTHREAD)
|
||||
endif # USE_PTHREADS
|
||||
|
||||
@ -33,13 +36,23 @@ $OpenBSD: patch-jdk_make_common_Program_gmk,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
#
|
||||
# This rule only applies on unix. It supports quantify and its ilk.
|
||||
#
|
||||
@@ -242,7 +254,9 @@ endif
|
||||
@@ -242,15 +257,19 @@ endif
|
||||
|
||||
|
||||
ifneq ($(PLATFORM), windows)
|
||||
+ifneq ($(PLATFORM), bsd)
|
||||
HAVE_GETHRTIME=true
|
||||
+endif
|
||||
endif
|
||||
+endif
|
||||
|
||||
ifeq ($(HAVE_GETHRTIME),true)
|
||||
OTHER_CPPFLAGS += -DHAVE_GETHRTIME
|
||||
endif
|
||||
|
||||
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)/bin -I$(LAUNCHER_PLATFORM_SRC)/bin
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
OTHER_INCLUDES += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
||||
+endif
|
||||
|
||||
# this may not be necessary...
|
||||
ifeq ($(PLATFORM), windows)
|
||||
|
||||
@ -1,7 +1,38 @@
|
||||
$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
$OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
|
||||
--- jdk/make/java/jli/Makefile.orig Sat Dec 1 00:00:00 2007
|
||||
+++ jdk/make/java/jli/Makefile Tue Feb 26 20:49:52 2008
|
||||
@@ -96,10 +96,12 @@ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
|
||||
+++ jdk/make/java/jli/Makefile Sun Dec 21 22:10:42 2008
|
||||
@@ -44,8 +44,10 @@ MS_RUNTIME_STATIC = true
|
||||
|
||||
include $(BUILDDIR)/common/Defs.gmk
|
||||
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
ZLIB_VERSION = 1.1.3
|
||||
ZIP_SRC = $(SHARE_SRC)/native/java/util/zip/zlib-$(ZLIB_VERSION)
|
||||
+endif
|
||||
LAUNCHER_SHARE_SRC = $(SHARE_SRC)/bin
|
||||
LAUNCHER_PLATFORM_SRC = $(PLATFORM_SRC)/bin
|
||||
|
||||
@@ -66,7 +68,10 @@ FILES_c = \
|
||||
parse_manifest.c \
|
||||
version_comp.c \
|
||||
wildcard.c \
|
||||
- jli_util.c \
|
||||
+ jli_util.c
|
||||
+
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
+FILES_c += \
|
||||
inflate.c \
|
||||
infblock.c \
|
||||
inftrees.c \
|
||||
@@ -75,6 +80,7 @@ FILES_c = \
|
||||
infutil.c \
|
||||
zadler32.c \
|
||||
zutil.c
|
||||
+endif
|
||||
|
||||
ifneq ($(PLATFORM), windows)
|
||||
|
||||
@@ -96,10 +102,12 @@ OTHER_CPPFLAGS += $(LIBARCH_DEFINES)
|
||||
|
||||
ifneq ($(PLATFORM), windows) # UNIX systems
|
||||
LIB_LOCATION = $(LIBDIR)/$(LIBARCH)/jli
|
||||
@ -14,11 +45,22 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
ifeq ($(USE_PTHREADS),true)
|
||||
LDLIBS += -lpthread
|
||||
endif # USE_PTHREADS
|
||||
@@ -158,6 +160,24 @@ $(STATIC_LIBRARY): $(STATIC_LIBRARY_DIR)
|
||||
library:: $(STATIC_LIBRARY)
|
||||
@@ -121,7 +129,11 @@ endif
|
||||
|
||||
OTHER_INCLUDES += -I$(LAUNCHER_SHARE_SRC)
|
||||
OTHER_INCLUDES += -I$(LAUNCHER_PLATFORM_SRC)
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
OTHER_INCLUDES += -I$(ZIP_SRC)
|
||||
+else
|
||||
+LDLIBS += -lz
|
||||
+endif
|
||||
|
||||
#
|
||||
# Library to compile.
|
||||
@@ -159,7 +171,28 @@ library:: $(STATIC_LIBRARY)
|
||||
|
||||
endif # PLATFORM
|
||||
+
|
||||
|
||||
+ifeq ($(PLATFORM), bsd)
|
||||
+
|
||||
+STATIC_LIBRARY_DIR = $(OBJDIR)/static
|
||||
@ -36,6 +78,12 @@ $OpenBSD: patch-jdk_make_java_jli_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
+library:: $(STATIC_LIBRARY)
|
||||
+
|
||||
+endif # PLATFORM
|
||||
|
||||
+
|
||||
#
|
||||
# Add to ambient vpath so we pick up the library files
|
||||
#
|
||||
-vpath %.c $(LAUNCHER_SHARE_SRC) $(ZIP_SRC) $(LAUNCHER_PLATFORM_SRC)
|
||||
+vpath %.c $(LAUNCHER_SHARE_SRC) $(LAUNCHER_PLATFORM_SRC)
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
+vpath %.c $(ZIP_SRC)
|
||||
+endif
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
$OpenBSD: patch-jdk_make_sun_splashscreen_FILES_c_gmk,v 1.1 2008/12/22 13:22:12 kurt Exp $
|
||||
--- jdk/make/sun/splashscreen/FILES_c.gmk.orig Sun Dec 21 22:11:05 2008
|
||||
+++ jdk/make/sun/splashscreen/FILES_c.gmk Sun Dec 21 22:11:53 2008
|
||||
@@ -49,20 +49,6 @@ FILES_c = \
|
||||
dgif_lib.c \
|
||||
gif_err.c \
|
||||
gifalloc.c \
|
||||
- compress.c \
|
||||
- deflate.c \
|
||||
- gzio.c \
|
||||
- infblock.c \
|
||||
- infcodes.c \
|
||||
- inffast.c \
|
||||
- inflate.c \
|
||||
- inftrees.c \
|
||||
- infutil.c \
|
||||
- trees.c \
|
||||
- uncompr.c \
|
||||
- zadler32.c \
|
||||
- zcrc32.c \
|
||||
- zutil.c \
|
||||
jcomapi.c \
|
||||
jdapimin.c \
|
||||
jdapistd.c \
|
||||
@@ -108,3 +94,20 @@ FILES_c = \
|
||||
jfdctfst.c \
|
||||
jfdctint.c
|
||||
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
+FILES_c += \
|
||||
+ compress.c \
|
||||
+ deflate.c \
|
||||
+ gzio.c \
|
||||
+ infblock.c \
|
||||
+ infcodes.c \
|
||||
+ inffast.c \
|
||||
+ inflate.c \
|
||||
+ inftrees.c \
|
||||
+ infutil.c \
|
||||
+ trees.c \
|
||||
+ uncompr.c \
|
||||
+ zadler32.c \
|
||||
+ zcrc32.c \
|
||||
+ zutil.c
|
||||
+endif
|
||||
@ -1,12 +1,15 @@
|
||||
$OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.1 2008/03/19 18:05:45 kurt Exp $
|
||||
--- jdk/make/sun/splashscreen/Makefile.orig Tue Oct 30 05:04:28 2007
|
||||
+++ jdk/make/sun/splashscreen/Makefile Wed Nov 7 18:13:36 2007
|
||||
@@ -61,10 +61,22 @@ JAVALIB=
|
||||
$OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.2 2008/12/22 13:22:12 kurt Exp $
|
||||
--- jdk/make/sun/splashscreen/Makefile.orig Sat Dec 1 00:00:00 2007
|
||||
+++ jdk/make/sun/splashscreen/Makefile Sun Dec 21 22:13:22 2008
|
||||
@@ -61,10 +61,25 @@ JAVALIB=
|
||||
|
||||
CFLAGS += -DSPLASHSCREEN
|
||||
|
||||
+CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen -I$(SHARE_SRC)/native/$(PKGDIR)/splashscreen
|
||||
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
||||
+CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
+CPPFLAGS += -I$(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
||||
+endif
|
||||
+
|
||||
ifneq ($(PLATFORM), windows)
|
||||
CFLAGS += -DWITH_X11
|
||||
@ -26,7 +29,13 @@ $OpenBSD: patch-jdk_make_sun_splashscreen_Makefile,v 1.1 2008/03/19 18:05:45 kur
|
||||
else # PLATFORM
|
||||
CFLAGS += -DWITH_WIN32
|
||||
OTHER_LDLIBS += kernel32.lib user32.lib gdi32.lib
|
||||
@@ -81,7 +93,4 @@ vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1
|
||||
@@ -77,11 +92,10 @@ endif # PLATFORM
|
||||
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/splashscreen
|
||||
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)
|
||||
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/giflib
|
||||
+ifneq ($(SYSTEM_ZLIB),true)
|
||||
vpath %.c $(SHARE_SRC)/native/java/util/zip/zlib-1.1.3
|
||||
+endif
|
||||
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/libpng
|
||||
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/image/jpeg
|
||||
vpath %.c $(PLATFORM_SRC)/native/$(PKGDIR)/splashscreen
|
||||
|
||||
Loading…
Reference in New Issue
Block a user