diff options
| author | fhajny <fhajny@pkgsrc.org> | 2015-07-18 07:07:42 +0000 |
|---|---|---|
| committer | fhajny <fhajny@pkgsrc.org> | 2015-07-18 07:07:42 +0000 |
| commit | 374bd55569f885740c1d37763c82b08cb4064174 (patch) | |
| tree | c120101e4a351fc7ace2c787ded3235dd917ad00 /lang/openjdk8 | |
| parent | 3f496c5c52ac231daf66bb8ecf1f6b88386aaacd (diff) | |
| download | pkgsrc-374bd55569f885740c1d37763c82b08cb4064174.tar.gz | |
One more fix for SunOS - do not pollute 'as' arg space with arch flags.
Diffstat (limited to 'lang/openjdk8')
| -rw-r--r-- | lang/openjdk8/distinfo | 4 | ||||
| -rw-r--r-- | lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make | 14 |
2 files changed, 11 insertions, 7 deletions
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo index b4ef68f097c..b657d846e44 100644 --- a/lang/openjdk8/distinfo +++ b/lang/openjdk8/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.22 2015/07/03 20:40:59 fhajny Exp $ +$NetBSD: distinfo,v 1.23 2015/07/18 07:07:42 fhajny Exp $ SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815 @@ -56,7 +56,7 @@ SHA1 (patch-hotspot_make_solaris_makefiles_build__vm__def.sh) = 54d197a94d27406f SHA1 (patch-hotspot_make_solaris_makefiles_debug.make) = 7195c97c4f559b2e9410028315de351c5047d59d SHA1 (patch-hotspot_make_solaris_makefiles_dtrace.make) = 0c9dc2b97d49cf557dc57071fd7c312b9cb8e598 SHA1 (patch-hotspot_make_solaris_makefiles_fastdebug.make) = 632f96a322f1568df6f49bf31716bafe1d324976 -SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 9aef5948efd9ef11f862c00d14b4d6dfec019be4 +SHA1 (patch-hotspot_make_solaris_makefiles_gcc.make) = 4763215f5ce2c3d9fcadb69e52afad7c9de97417 SHA1 (patch-hotspot_make_solaris_makefiles_jsig.make) = 10ecc1bd24d6d555e4730041c9dce1d3258bcab0 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER1.gcc) = 58965fe7c142b67be35cab8b30f84dcee2096e39 SHA1 (patch-hotspot_make_solaris_makefiles_mapfile-vers-COMPILER2.gcc) = 2dfd843c450971ee0857cbd81b946a4d7c86ee3b diff --git a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make index 3ab5e8e4627..c0611d7400f 100644 --- a/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make +++ b/lang/openjdk8/patches/patch-hotspot_make_solaris_makefiles_gcc.make @@ -1,8 +1,8 @@ -$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.1 2015/07/03 20:40:59 fhajny Exp $ +$NetBSD: patch-hotspot_make_solaris_makefiles_gcc.make,v 1.2 2015/07/18 07:07:42 fhajny Exp $ GCC support. ---- hotspot/make/solaris/makefiles/gcc.make.orig 2015-02-02 15:32:37.000000000 +0000 +--- hotspot/make/solaris/makefiles/gcc.make.orig 2015-06-10 10:31:44.000000000 +0000 +++ hotspot/make/solaris/makefiles/gcc.make @@ -70,11 +70,23 @@ VM_PICFLAG/LIBJVM = $(PICFLAG) VM_PICFLAG/AOUT = @@ -38,14 +38,18 @@ GCC support. ISA_DIR/i486= ISA_DIR/sparcv9=/64 -@@ -94,7 +107,6 @@ +@@ -94,10 +107,9 @@ ISA_DIR/sparcv9=/64 CFLAGS += $(ARCHFLAG) AOUT_FLAGS += $(ARCHFLAG) LFLAGS += $(ARCHFLAG) -ASFLAGS += $(ARCHFLAG) - + ifeq ($(BUILDARCH), amd64) - ASFLAGS += -march=k8 -march=amd64 +-ASFLAGS += -march=k8 -march=amd64 ++ASFLAGS += -march=k8 + LFLAGS += -march=k8 + endif + @@ -107,6 +119,11 @@ ifdef CC_INTERP CFLAGS += -DCC_INTERP endif |