OpenBSD

[Bryan C. Everly]

Updated diff below (sorry for the typos):

--- a/make/Defs.gmk Mon May 18 18:34:08 2015 -0700
+++ b/make/Defs.gmk Thu May 21 20:56:55 2015 -0400
@@ -260,9 +260,9 @@
 SORT    = /usr/bin/sort
 TEST = /usr/bin/test
 TOUCH = /usr/bin/touch
-UNZIP = /usr/bin/unzip
+UNZIP   := $(shell if [ -r /usr/bin/unzip ]; then echo /usr/bin/unzip
; else echo /usr/local/bin/unzip ; fi )
 WC = /usr/bin/wc
-ZIP = /usr/bin/zip
+ZIP     := $(shell if [ -r /usr/bin/zip ]; then echo /usr/bin/zip ;
else echo /usr/local/bin/zip ; fi )


 #----------------------------------------------------------------------
diff -r afdc0ea0286a make/Platform.gmk
--- a/make/Platform.gmk Mon May 18 18:34:08 2015 -0700
+++ b/make/Platform.gmk Thu May 21 20:56:55 2015 -0400
@@ -47,6 +47,11 @@
   OS_ARCH    := $(shell $(UNAME) -p)
   OS_VERSION := $(shell $(UNAME) -r)
 endif
+ifeq ($(UNAME_S), OpenBSD)
+  OS_NAME     = openbsd
+  OS_ARCH    := $(shell $(UNAME) -p)
+  OS_VERSION := $(shell $(UNAME) -r)
+endif
 ifeq ($(UNAME_S), Linux)
   OS_NAME     = linux
   OS_ARCH    := $(shell $(UNAME) -m)

Thanks,
Bryan


On Thu, May 21, 2015 at 8:05 PM, Bryan Everly <bryan at bceassociates.com> wrote:
> Thanks for the catch. That would be a typo. Should both read $(shell
>
> Thanks,
> Bryan
>
>> On May 21, 2015, at 7:06 PM, Jonathan Gibbons <jonathan.gibbons at oracle.com> wrote:
>>
>> Bryan,
>>
>> jtreg-dev at openjdk would be a slightly better alias for this, but this one works too.
>>
>> I can take a look at this next week, but in the meantime, I would ask
>> why the different form of the lines for the changes to the UNZIP and
>> ZIP settings.  Meaning "*shell" vs "$(shell".
>>
>> -- Jon
>>
>>
>>> On 05/21/2015 08:12 AM, Bryan C. Everly wrote:
>>> Hello,
>>>
>>> I was able to get jtreg to build on OpenBSD 5.7 with a couple of small
>>> diffs (see below). In working with the folks on the OpenJDK BSD Port
>>> project, they suggested I reach out to this list to see if someone
>>> would be willing to commit these on my behalf?  I have signed an OCA
>>> and am assisting on the OpenJDK BSD Port project so there shouldn't be
>>> any problems from that perspective.  I'd be happy to test the code
>>> after the changes are committed to make sure that everything is
>>> working ok.
>>>
>>> Some notes:
>>>
>>> While the Platform.gmk looks like it isn't used, it keeps us from
>>> falling into code that assumes this is Cygwin on Windows (which messes
>>> all sorts of things up).  I figured why not create those variables for
>>> later use that identify our platform.
>>>
>>> The diffs:
>>>
>>> diff -r afdc0ea0286a make/Defs.gmk
>>> --- a/make/Defs.gmk Mon May 18 18:34:08 2015 -0700
>>> +++ b/make/Defs.gmk Wed May 20 12:51:22 2015 -0400
>>> @@ -261,8 +261,9 @@
>>>  TEST = /usr/bin/test
>>>  TOUCH = /usr/bin/touch
>>>  UNZIP = /usr/bin/unzip
>>> +UNZIP   := *shell if [ -r /usr/bin/unzip ]; then echo /usr/bin/unzip
>>> ; else echo /usr/local/bin/unzip ; fi )
>>>  WC = /usr/bin/wc
>>> -ZIP = /usr/bin/zip
>>> +ZIP     := $(shell if [ -r /usr/bin/zip ]; then echo /usr/bin/zip ;
>>> else echo /usr/local/bin/zip ; fi )
>>>
>>>
>>>  #----------------------------------------------------------------------
>>> diff -r afdc0ea0286a make/Platform.gmk
>>> --- a/make/Platform.gmk Mon May 18 18:34:08 2015 -0700
>>> +++ b/make/Platform.gmk Wed May 20 12:51:22 2015 -0400
>>> @@ -47,6 +47,11 @@
>>>    OS_ARCH    := $(shell $(UNAME) -p)
>>>    OS_VERSION := $(shell $(UNAME) -r)
>>>  endif
>>> +ifeq ($(UNAME_S), OpenBSD)
>>> +  OS_NAME     = openbsd
>>> +  OS_ARCH    := $(shell $(UNAME) -p)
>>> +  OS_VERSION := $(shell $(UNAME) -r)
>>> +endif
>>>  ifeq ($(UNAME_S), Linux)
>>>    OS_NAME     = linux
>>>    OS_ARCH    := $(shell $(UNAME) -m)
>>>
>>> Thanks,
>>> Bryan
>>