head	1.2;
access;
symbols
	pkgsrc-2020Q1:1.1.0.36
	pkgsrc-2020Q1-base:1.1
	pkgsrc-2019Q4:1.1.0.58
	pkgsrc-2019Q4-base:1.1
	pkgsrc-2019Q3:1.1.0.54
	pkgsrc-2019Q3-base:1.1
	pkgsrc-2019Q2:1.1.0.52
	pkgsrc-2019Q2-base:1.1
	pkgsrc-2019Q1:1.1.0.50
	pkgsrc-2019Q1-base:1.1
	pkgsrc-2018Q4:1.1.0.48
	pkgsrc-2018Q4-base:1.1
	pkgsrc-2018Q3:1.1.0.46
	pkgsrc-2018Q3-base:1.1
	pkgsrc-2018Q2:1.1.0.44
	pkgsrc-2018Q2-base:1.1
	pkgsrc-2018Q1:1.1.0.42
	pkgsrc-2018Q1-base:1.1
	pkgsrc-2017Q4:1.1.0.40
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.38
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.34
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.32
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.30
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.28
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.26
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.24
	pkgsrc-2016Q1-base:1.1
	pkgsrc-2015Q4:1.1.0.22
	pkgsrc-2015Q4-base:1.1
	pkgsrc-2015Q3:1.1.0.20
	pkgsrc-2015Q3-base:1.1
	pkgsrc-2015Q2:1.1.0.18
	pkgsrc-2015Q2-base:1.1
	pkgsrc-2015Q1:1.1.0.16
	pkgsrc-2015Q1-base:1.1
	pkgsrc-2014Q4:1.1.0.14
	pkgsrc-2014Q4-base:1.1
	pkgsrc-2014Q3:1.1.0.12
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.10
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.8
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.6
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.4
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.2
	pkgsrc-2013Q2-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2020.05.17.00.47.06;	author tnn;	state dead;
branches;
next	1.1;
commitid	by06jUrXKAUzQw8C;

1.1
date	2013.06.15.09.31.06;	author jperkin;	state Exp;
branches;
next	;
commitid	gr72iqj6cRdUZGTw;


desc
@@


1.2
log
@retire lang/openjdk7
@
text
@$NetBSD: patch-jdk_make_sun_awt_Makefile,v 1.1 2013/06/15 09:31:06 jperkin Exp $

GCC support.

--- jdk/make/sun/awt/Makefile.orig	2013-06-11 14:02:41.501545894 +0000
+++ jdk/make/sun/awt/Makefile
@@@@ -94,6 +94,7 @@@@ ifeq  ($(PLATFORM), solaris)
 FILES_c = $(FILES_2D_c)
 FILES_c += awt_LoadLibrary.c
 OTHER_LDLIBS = $(JVMLIB) $(LIBM) $(LIBDL)
+ifneq ($(CC_VERSION), gcc)
 ifeq ($(CC_VER), 5.8)
   ifndef REMOVE_ALL_WORKAROUNDS
     ifeq ($(ARCH_FAMILY), i586)
@@@@ -114,6 +115,7 @@@@ ifeq ($(CC_VER), 5.8)
     endif
   endif
 endif
+endif # ! CC_VERSION
 endif
 
 ifeq  ($(PLATFORM), linux)
@@@@ -427,7 +429,15 @@@@ FONTCONFIGS_SRC	= $(PLATFORM_SRC)/classe
 _FONTCONFIGS	= \
 	fontconfig.properties
 
-FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+ifndef DISTRO
+  DISTRO=$(PLATFORM)
+endif # DISTRO
+
+ifeq ($(DISTRO), pkgsrc)
+  FONTCONFIGS_SRC_PREFIX = pkgsrc.
+else
+  FONTCONFIGS_SRC_PREFIX = $(PLATFORM).
+endif # DISTRO
 
 # ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ SOLARIS
 endif # PLATFORM
@@@@ -543,12 +553,7 @@@@ ifneq ($(PLATFORM), windows)
 # Other extra flags needed for compiling.
 #
 
-ifeq ($(PLATFORM), linux)
-CPPFLAGS += -I$(OPENWIN_HOME)/include \
-            -I$(OPENWIN_HOME)/include/X11/extensions \
-            -I$(PLATFORM_SRC)/native/$(PKGDIR)/font 
-endif
-ifeq ($(PLATFORM), bsd)
+ifneq (,$(findstring $(PLATFORM), linux bsd solaris))
 CPPFLAGS += -I$(PLATFORM_SRC)/native/$(PKGDIR)/font
 endif
 CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGDIR)/debug \
@@@@ -573,13 +578,10 @@@@ CPPFLAGS += -I$(SHARE_SRC)/native/$(PKGD
 	    $(EVENT_MODEL)
 
 # include these last so we don't pick up unintentional includes
-ifeq ($(PLATFORM), bsd)
+ifneq (,$(findstring $(PLATFORM), linux bsd solaris))
 CPPFLAGS += -I$(OPENWIN_HOME)/include \
-	    -I$(OPENWIN_HOME)/include/X11/extensions
-endif
-
-ifneq (,$(findstring $(PLATFORM), linux bsd))
-LDFLAGS += -L$(OPENWIN_LIB)
+            -I$(OPENWIN_HOME)/include/X11/extensions
+LDFLAGS += -L$(OPENWIN_LIB) -Wl,-R$(OPENWIN_LIB)
 endif
 
 LDFLAGS += -L$(LIBDIR)/$(LIBARCH)/$(TSOBJDIR) \
@


1.1
log
@Add SunOS/GCC support.  With huge thanks to "jesse" from #SmartOS who did the
bulk of the porting work.  Tested on SmartOS 32-bit.  64-bit builds currently
fail, they should hopefully be fixed soon.
@
text
@d1 1
a1 1
$NetBSD$
@